Move GtkWindow g_autoptr macros in the class header

Otherwise we won't be able to use G_DECLARE_* macros internally to GTK
without generating warnings, or without including gtk.h itself.

diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 536187248b1cfe03466ea81399aaaff3b212e0de..4a9e621746f3cbf3aa60068c203305f801bdadcb 100644 (file)
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -205,8 +205,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkTreeViewColumn, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkViewport, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkVolumeButton, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWidget, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindow, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindowGroup, g_object_unref)
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBorder, gtk_border_free)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaperSize, gtk_paper_size_free)

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index bd73697f38887083b52ef863421618cf047dee2f..9ca45bd07a1e1dd876aa733be6a0c0af31c37f3e 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -497,6 +497,11 @@ gboolean gtk_window_is_maximized           (GtkWindow    *window);
 GDK_AVAILABLE_IN_3_14
 void     gtk_window_set_interactive_debugging (gboolean enable);
 
+#ifndef __GI_SCANNER__
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindow, g_object_unref)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkWindowGroup, g_object_unref)
+#endif
+
 G_END_DECLS
 
 #endif /* __GTK_WINDOW_H__ */